|
Adding BlimpNavigationController to Tab
Added blimp navigation controller to tab so that tab can route the
navigation calls to the correct navigation controller depending on
blimp mode. A TabObserver was created to be notified about the blimp
navigation events. Also changed ToolbarModelImpl to reflect the
correct url in blimp mode.
Also moved the blimp client context delegate initialization to an
early life cycle method in ChromeActivity.
Added a method to get the Java object from native BlimpContents.
BUG= 611100
Committed: https://crrev.com/26a1d3f241bfaeaf32db9a3b10d3b10a0d9817b4
Cr-Commit-Position: refs/heads/master@{#413924}
Total comments: 16
Total comments: 21
Total comments: 18
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+229 lines, -30 lines) |
Patch |
|
M |
blimp/client/core/android/blimp_client_context_impl_android.cc
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
View
|
1
2
3
4
5
6
|
1 chunk |
+7 lines, -2 lines |
0 comments
|
Download
|
|
M |
blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+6 lines, -2 lines |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/android/blimp_navigation_controller_impl_android.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/android/blimp_navigation_controller_impl_android.cc
|
View
|
1
2
3
4
5
6
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java
|
View
|
1
|
3 chunks |
+8 lines, -1 line |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/blimp_contents_impl.h
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/blimp_contents_impl.cc
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/blimp_navigation_controller_impl.h
|
View
|
1
|
2 chunks |
+4 lines, -0 lines |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/blimp_navigation_controller_impl.cc
|
View
|
|
3 chunks |
+8 lines, -2 lines |
0 comments
|
Download
|
|
M |
blimp/client/core/contents/blimp_navigation_controller_impl_unittest.cc
|
View
|
1
2
3
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
blimp/client/public/android/java/src/org/chromium/blimp_public/BlimpClientContext.java
|
View
|
1
2
3
4
5
6
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
|
M |
blimp/client/public/android/java/src/org/chromium/blimp_public/contents/BlimpNavigationController.java
|
View
|
1
|
2 chunks |
+7 lines, -5 lines |
0 comments
|
Download
|
|
M |
blimp/client/public/contents/blimp_contents.h
|
View
|
1
2
|
2 chunks |
+10 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
View
|
1
2
3
4
5
6
|
2 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
|
M |
chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
View
|
1
2
3
4
5
6
7
|
15 chunks |
+80 lines, -10 lines |
0 comments
|
Download
|
|
A |
chrome/android/java/src/org/chromium/chrome/browser/tab/TabBlimpContentsObserver.java
|
View
|
1
2
3
|
1 chunk |
+31 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/android/java_sources.gni
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/android/blimp/blimp_client_context_factory.h
|
View
|
1
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/android/blimp/blimp_client_context_factory.cc
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/android/tab_android.h
|
View
|
1
2
3
4
5
6
|
4 chunks |
+17 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/android/tab_android.cc
|
View
|
1
2
3
4
5
6
|
4 chunks |
+24 lines, -0 lines |
0 comments
|
Download
|
Depends on Patchset:
Total messages: 38 (15 generated)
|