Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: chrome/browser/chromeos/login/simple_web_view_dialog.cc

Issue 11040055: Adds a FakeToolbarModel for use in testing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: git try Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/login/simple_web_view_dialog.h" 5 #include "chrome/browser/chromeos/login/simple_web_view_dialog.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h" 12 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h" 15 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h"
16 #include "chrome/browser/ui/tab_contents/tab_contents.h" 16 #include "chrome/browser/ui/tab_contents/tab_contents.h"
17 #include "chrome/browser/ui/toolbar/toolbar_model.h" 17 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
18 #include "chrome/browser/ui/view_ids.h" 18 #include "chrome/browser/ui/view_ids.h"
19 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 19 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
20 #include "chrome/browser/ui/views/page_info_bubble_view.h" 20 #include "chrome/browser/ui/views/page_info_bubble_view.h"
21 #include "chrome/browser/ui/views/reload_button.h" 21 #include "chrome/browser/ui/views/reload_button.h"
22 #include "content/public/browser/navigation_controller.h" 22 #include "content/public/browser/navigation_controller.h"
23 #include "content/public/browser/navigation_entry.h" 23 #include "content/public/browser/navigation_entry.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
26 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
27 #include "ipc/ipc_message.h" 27 #include "ipc/ipc_message.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 back_->set_id(VIEW_ID_BACK_BUTTON); 172 back_->set_id(VIEW_ID_BACK_BUTTON);
173 173
174 forward_ = new views::ImageButton(this); 174 forward_ = new views::ImageButton(this);
175 forward_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | 175 forward_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
176 ui::EF_MIDDLE_MOUSE_BUTTON); 176 ui::EF_MIDDLE_MOUSE_BUTTON);
177 forward_->set_tag(IDC_FORWARD); 177 forward_->set_tag(IDC_FORWARD);
178 forward_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD)); 178 forward_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD));
179 forward_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD)); 179 forward_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD));
180 forward_->set_id(VIEW_ID_FORWARD_BUTTON); 180 forward_->set_id(VIEW_ID_FORWARD_BUTTON);
181 181
182 toolbar_model_.reset(new ToolbarModel(this)); 182 toolbar_model_.reset(new ToolbarModelImpl(this));
183 183
184 // Location bar. 184 // Location bar.
185 location_bar_ = new LocationBarView(NULL, 185 location_bar_ = new LocationBarView(NULL,
186 profile_, 186 profile_,
187 command_updater_.get(), 187 command_updater_.get(),
188 toolbar_model_.get(), 188 toolbar_model_.get(),
189 this, 189 this,
190 NULL, // no SearchModel 190 NULL, // no SearchModel
191 LocationBarView::POPUP); 191 LocationBarView::POPUP);
192 192
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 387
388 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { 388 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {
389 if (reload_) { 389 if (reload_) {
390 reload_->ChangeMode( 390 reload_->ChangeMode(
391 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, 391 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
392 force); 392 force);
393 } 393 }
394 } 394 }
395 395
396 } // namespace chromeos 396 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698