chrome/browser/extensions/settings_api_bubble_controller.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

Side by Side Diff: chrome/browser/extensions/settings_api_bubble_controller.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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

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

6	6

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

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

9 #include "chrome/browser/extensions/extension_toolbar_model.h"	9 #include "chrome/browser/extensions/extension_toolbar_model.h"

10 #include "chrome/browser/extensions/settings_api_helpers.h"	10 #include "chrome/browser/extensions/settings_api_helpers.h"

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

12 #include "chrome/browser/ui/startup/startup_browser_creator.h"	12 #include "chrome/browser/ui/startup/startup_browser_creator.h"

13 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h"	13 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h"

14 #include "chrome/common/url_constants.h"	14 #include "chrome/common/url_constants.h"

	15 #include "chrome/grit/chromium_strings.h"

	16 #include "chrome/grit/generated_resources.h"

15 #include "extensions/browser/extension_prefs.h"	17 #include "extensions/browser/extension_prefs.h"

16 #include "extensions/browser/extension_registry.h"	18 #include "extensions/browser/extension_registry.h"

17 #include "extensions/browser/extension_system.h"	19 #include "extensions/browser/extension_system.h"

18 #include "grit/chromium_strings.h"

19 #include "grit/generated_resources.h"

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

21	21

22 namespace extensions {	22 namespace extensions {

23	23

24 namespace {	24 namespace {

25	25

26 ////////////////////////////////////////////////////////////////////////////////	26 ////////////////////////////////////////////////////////////////////////////////

27 // SettingsApiBubbleDelegate	27 // SettingsApiBubbleDelegate

28	28

29 class SettingsApiBubbleDelegate	29 class SettingsApiBubbleDelegate

(...skipping 276 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
306 return true;	306 return true;

307 }	307 }

308	308

309 bool SettingsApiBubbleController::CloseOnDeactivate() {	309 bool SettingsApiBubbleController::CloseOnDeactivate() {

310 // Startup bubbles tend to get lost in the focus storm that happens on	310 // Startup bubbles tend to get lost in the focus storm that happens on

311 // startup. Other types should dismiss on focus loss.	311 // startup. Other types should dismiss on focus loss.

312 return type_ != BUBBLE_TYPE_STARTUP_PAGES;	312 return type_ != BUBBLE_TYPE_STARTUP_PAGES;

313 }	313 }

314	314

315 } // namespace extensions	315 } // namespace extensions

OLD	NEW