1
=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml'
2
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml	2014-03-27 12:01:14 +0000
3
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml	2014-04-07 21:19:50 +0000
4
@@ -19,7 +19,7 @@
5
19
pragma Singleton
19
pragma Singleton
6
20
20
7
21
import QtQuick 2.0
21
import QtQuick 2.0
9
22
import com.canonical.Oxide 0.1
22
import com.canonical.Oxide 1.0
10
23
23
11
24
Item {
24
Item {
12
25
    property string customUA: userAgent.defaultUA
25
    property string customUA: userAgent.defaultUA
13
26
26
14
=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml'
15
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-03-27 11:51:08 +0000
16
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-04-07 21:19:50 +0000
17
@@ -18,7 +18,7 @@
18
18
18
19
19
import QtQuick 2.0
19
import QtQuick 2.0
20
20
import QtQuick.Window 2.0
20
import QtQuick.Window 2.0
22
21
import com.canonical.Oxide 0.1
21
import com.canonical.Oxide 1.0
23
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
24
23
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 0.1
25
24
import "."
24
import "."
26
25
25
27
=== modified file 'src/Ubuntu/Components/Extras/Browser/UserAgent02.qml'
28
--- src/Ubuntu/Components/Extras/Browser/UserAgent02.qml	2014-03-24 12:32:52 +0000
29
+++ src/Ubuntu/Components/Extras/Browser/UserAgent02.qml	2014-04-07 21:19:50 +0000
30
@@ -33,12 +33,15 @@
31
33
    // %3: optional hardware ID token (must start with a semi-colon if present)
33
    // %3: optional hardware ID token (must start with a semi-colon if present)
32
34
    // %4: WebKit version, e.g. "537.36"
34
    // %4: WebKit version, e.g. "537.36"
33
35
    // %5: Chromium version, e.g. "35.0.1870.2"
35
    // %5: Chromium version, e.g. "35.0.1870.2"
35
36
    // %6: optional token to provide additional free-form information (must start with a whitespace), e.g. "Mobile"
36
    // %6: Optional token to provide additional free-form information (must end with a whitespace), e.g. "Mobile "
36
37
    // %7: Safari version, e.g. "537.36"
37
38
    // %8: Optional token, in case some extra bits are needed to make things work (e.g. an extra formfactor info etc.)
38
39
    // 
39
37
    // note #1: "Mozilla/5.0" is misinformation, but it is a legacy token that
40
    // note #1: "Mozilla/5.0" is misinformation, but it is a legacy token that
40
38
    //   virtually every single UA out there has, it seems unwise to remove it
41
    //   virtually every single UA out there has, it seems unwise to remove it
41
39
    // note #2: "AppleWebKit", as opposed to plain "WebKit", does make a
42
    // note #2: "AppleWebKit", as opposed to plain "WebKit", does make a
42
40
    //   difference in the content served by certain sites (e.g. gmail.com)
43
    //   difference in the content served by certain sites (e.g. gmail.com)
44
41
    readonly property string _template: "Mozilla/5.0 (Linux; Ubuntu %1%2%3) AppleWebKit/%4 Chromium/%5%6"
44
    readonly property string _template: "Mozilla/5.0 (Linux; Ubuntu %1%2%3) AppleWebKit/%4 Chromium/%5 %6Safari/%7%8"
45
42
45
46
43
    // FIXME: compute at build time (using lsb_release)
46
    // FIXME: compute at build time (using lsb_release)
47
44
    readonly property string _ubuntuVersion: "14.04"
47
    readonly property string _ubuntuVersion: "14.04"
48
@@ -56,7 +59,9 @@
49
56
    //       every time we rebase on a newer chromium.
59
    //       every time we rebase on a newer chromium.
50
57
    readonly property string _chromiumVersion: "35.0.1870.2"
60
    readonly property string _chromiumVersion: "35.0.1870.2"
51
58
61
55
59
    readonly property string _more: (formFactor === "mobile") ? " Mobile" : ""
62
    readonly property string _formFactor: (formFactor === "mobile") ? "Mobile " : ""
56
60
63
57
61
    property string defaultUA: _template.arg(_ubuntuVersion).arg(_attributes).arg(_hardwareID).arg(_webkitVersion).arg(_chromiumVersion).arg(_more)
64
    readonly property string _more: ""
58
65
59
66
    property string defaultUA: _template.arg(_ubuntuVersion).arg(_attributes).arg(_hardwareID).arg(_webkitVersion).arg(_chromiumVersion).arg(_formFactor).arg(_webkitVersion).arg(_more)
60
62
}
67
}
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2014-04-05	Disapprove on 2014-04-11
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-08
Review via email: mp+214361@code.launchpad.net