OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h" | 5 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h" |
6 | 6 |
7 #include "ash/frame/caption_buttons/frame_caption_button.h" | 7 #include "ash/frame/caption_buttons/frame_caption_button.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 widget->non_client_view()->frame_view()); | 55 widget->non_client_view()->frame_view()); |
56 } | 56 } |
57 | 57 |
58 Browser* CreateBrowser(Profile* profile, | 58 Browser* CreateBrowser(Profile* profile, |
59 Browser::Type browser_type, | 59 Browser::Type browser_type, |
60 bool hosted_app, | 60 bool hosted_app, |
61 chrome::HostDesktopType host_desktop_type, | 61 chrome::HostDesktopType host_desktop_type, |
62 BrowserWindow* browser_window) override { | 62 BrowserWindow* browser_window) override { |
63 RegisterExtension(profile); | 63 RegisterExtension(profile); |
64 | 64 |
65 Browser::CreateParams params(profile, host_desktop_type); | 65 Browser::CreateParams params(profile); |
66 params = Browser::CreateParams::CreateForApp("_crx_abc", | 66 params = Browser::CreateParams::CreateForApp( |
67 false /* trusted_source */, | 67 "_crx_abc", false /* trusted_source */, gfx::Rect(), profile); |
68 gfx::Rect(), | |
69 profile, | |
70 host_desktop_type); | |
71 params.window = browser_window; | 68 params.window = browser_window; |
72 return new Browser(params); | 69 return new Browser(params); |
73 } | 70 } |
74 | 71 |
75 protected: | 72 protected: |
76 // Owned by the browser view. | 73 // Owned by the browser view. |
77 BrowserNonClientFrameViewAsh* frame_view_; | 74 BrowserNonClientFrameViewAsh* frame_view_; |
78 | 75 |
79 // Owned by the browser. | 76 // Owned by the browser. |
80 TestToolbarModel* test_toolbar_model_; | 77 TestToolbarModel* test_toolbar_model_; |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 EXPECT_EQ(gfx::VectorIconId::LOCATION_BAR_HTTP, | 124 EXPECT_EQ(gfx::VectorIconId::LOCATION_BAR_HTTP, |
128 view->location_icon_->icon_image_id()); | 125 view->location_icon_->icon_image_id()); |
129 | 126 |
130 test_toolbar_model_->set_icon(gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID); | 127 test_toolbar_model_->set_icon(gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID); |
131 NavigateAndCommitActiveTab(GURL("https://secure.google.com")); | 128 NavigateAndCommitActiveTab(GURL("https://secure.google.com")); |
132 | 129 |
133 // The location icon should now be the secure one. | 130 // The location icon should now be the secure one. |
134 EXPECT_EQ(gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID, | 131 EXPECT_EQ(gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID, |
135 view->location_icon_->icon_image_id()); | 132 view->location_icon_->icon_image_id()); |
136 } | 133 } |
OLD | NEW |