chrome/browser/chromeos/login/merge_session_load_page.cc - Issue 225043002: Move extension_icon_set.{h,cc} to //extensions

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

Issue 225043002: Move extension_icon_set.{h,cc} to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 8 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/merge_session_load_page.h"	5 #include "chrome/browser/chromeos/login/merge_session_load_page.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_delegate.h"	8 #include "ash/shell_delegate.h"

9 #include "ash/system/tray/system_tray_delegate.h"	9 #include "ash/system/tray/system_tray_delegate.h"

10 #include "base/i18n/rtl.h"	10 #include "base/i18n/rtl.h"

11 #include "base/metrics/histogram.h"	11 #include "base/metrics/histogram.h"

12 #include "base/strings/string_piece.h"	12 #include "base/strings/string_piece.h"

13 #include "base/strings/stringprintf.h"	13 #include "base/strings/stringprintf.h"

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

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/chrome_notification_types.h"	16 #include "chrome/browser/chrome_notification_types.h"

17 #include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"	17 #include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"

18 #include "chrome/browser/extensions/extension_service.h"	18 #include "chrome/browser/extensions/extension_service.h"

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

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

21 #include "chrome/browser/tab_contents/tab_util.h"	21 #include "chrome/browser/tab_contents/tab_util.h"

22 #include "chrome/common/extensions/extension_constants.h"	22 #include "chrome/common/extensions/extension_constants.h"

23 #include "chrome/common/extensions/extension_icon_set.h"

24 #include "chrome/common/url_constants.h"	23 #include "chrome/common/url_constants.h"

25 #include "content/public/browser/browser_thread.h"	24 #include "content/public/browser/browser_thread.h"

26 #include "content/public/browser/interstitial_page.h"	25 #include "content/public/browser/interstitial_page.h"

27 #include "content/public/browser/notification_types.h"	26 #include "content/public/browser/notification_types.h"

28 #include "content/public/browser/web_contents.h"	27 #include "content/public/browser/web_contents.h"

29 #include "extensions/browser/extension_system.h"	28 #include "extensions/browser/extension_system.h"

30 #include "extensions/common/extension.h"	29 #include "extensions/common/extension.h"

	30 #include "extensions/common/extension_icon_set.h"

31 #include "grit/browser_resources.h"	31 #include "grit/browser_resources.h"

32 #include "grit/generated_resources.h"	32 #include "grit/generated_resources.h"

33 #include "net/base/escape.h"	33 #include "net/base/escape.h"

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

35 #include "ui/base/resource/resource_bundle.h"	35 #include "ui/base/resource/resource_bundle.h"

36 #include "ui/base/webui/jstemplate_builder.h"	36 #include "ui/base/webui/jstemplate_builder.h"

37	37

38 using content::BrowserThread;	38 using content::BrowserThread;

39 using content::InterstitialPage;	39 using content::InterstitialPage;

40 using content::WebContents;	40 using content::WebContents;

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
163 " NOT " : "")	163 " NOT " : "")

164 << " be blocking now, "	164 << " be blocking now, "

165 << state;	165 << state;

166 if (!manager->ShouldBlockTabLoading()) {	166 if (!manager->ShouldBlockTabLoading()) {

167 manager->RemoveObserver(this);	167 manager->RemoveObserver(this);

168 interstitial_page_->Proceed();	168 interstitial_page_->Proceed();

169 }	169 }

170 }	170 }

171	171

172 } // namespace chromeos	172 } // namespace chromeos

OLD	NEW