chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc - Issue 1652153003: Move toolbar_model_{impl,delegate}.{cc,h} to components/toolbar.

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

Issue 1652153003: Move toolbar_model_{impl,delegate}.{cc,h} to components/toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@3

Patch Set: Add static_cast<int> to fix compilation warning on Win Created 4 years, 10 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 | « chrome/browser/chromeos/login/DEPS ('k') | chrome/browser/ui/android/tab_model/tab_model.h » ('j') | no next file with comments »

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/chromeos/login/ui/simple_web_view_dialog.h"	5 #include "chrome/browser/chromeos/login/ui/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/macros.h"	9 #include "base/macros.h"

10 #include "base/message_loop/message_loop.h"	10 #include "base/message_loop/message_loop.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/app/chrome_command_ids.h"	12 #include "chrome/app/chrome_command_ids.h"

13 #include "chrome/browser/chromeos/login/helper.h"	13 #include "chrome/browser/chromeos/login/helper.h"

14 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"	14 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"

15 #include "chrome/browser/command_updater.h"	15 #include "chrome/browser/command_updater.h"

16 #include "chrome/browser/password_manager/chrome_password_manager_client.h"	16 #include "chrome/browser/password_manager/chrome_password_manager_client.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/ssl/chrome_security_state_model_client.h"	18 #include "chrome/browser/ssl/chrome_security_state_model_client.h"

19 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"	19 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"

20 #include "chrome/browser/ui/browser.h"	20 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h"	21 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h"

22 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"

23 #include "chrome/browser/ui/view_ids.h"	22 #include "chrome/browser/ui/view_ids.h"

24 #include "chrome/browser/ui/views/toolbar/reload_button.h"	23 #include "chrome/browser/ui/views/toolbar/reload_button.h"

25 #include "chrome/grit/generated_resources.h"	24 #include "chrome/grit/generated_resources.h"

26 #include "chrome/grit/theme_resources.h"	25 #include "chrome/grit/theme_resources.h"

27 #include "components/password_manager/core/browser/password_manager.h"	26 #include "components/password_manager/core/browser/password_manager.h"

28 #include "components/security_state/security_state_model.h"	27 #include "components/security_state/security_state_model.h"

	28 #include "components/toolbar/toolbar_model_impl.h"

29 #include "content/public/browser/navigation_controller.h"	29 #include "content/public/browser/navigation_controller.h"

30 #include "content/public/browser/navigation_entry.h"	30 #include "content/public/browser/navigation_entry.h"

31 #include "content/public/browser/web_contents.h"	31 #include "content/public/browser/web_contents.h"

32 #include "content/public/common/content_constants.h"	32 #include "content/public/common/content_constants.h"

33 #include "grit/components_strings.h"	33 #include "grit/components_strings.h"

34 #include "ipc/ipc_message.h"	34 #include "ipc/ipc_message.h"

35 #include "ui/base/l10n/l10n_util.h"	35 #include "ui/base/l10n/l10n_util.h"

36 #include "ui/base/theme_provider.h"	36 #include "ui/base/theme_provider.h"

37 #include "ui/views/background.h"	37 #include "ui/views/background.h"

38 #include "ui/views/controls/webview/webview.h"	38 #include "ui/views/controls/webview/webview.h"

(...skipping 353 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
392	392

393 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {	393 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {

394 if (reload_) {	394 if (reload_) {

395 reload_->ChangeMode(	395 reload_->ChangeMode(

396 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,	396 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,

397 force);	397 force);

398 }	398 }

399 }	399 }

400	400

401 } // namespace chromeos	401 } // namespace chromeos

OLD	NEW