chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc - Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/

Side by Side Diff: chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 9 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/ui/views/ash/launcher/chrome_launcher_delegate.h ('k') | chrome/browser/ui/views/ash/launcher/launcher_context_menu.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/ui/views/aura/launcher/chrome_launcher_delegate.h"	5 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"

6	6

7 #include "ash/launcher/launcher_model.h"	7 #include "ash/launcher/launcher_model.h"

8 #include "ash/launcher/launcher_types.h"	8 #include "ash/launcher/launcher_types.h"

9 #include "ash/wm/window_util.h"	9 #include "ash/wm/window_util.h"

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

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

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

13 #include "chrome/browser/defaults.h"	13 #include "chrome/browser/defaults.h"

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

15 #include "chrome/browser/prefs/incognito_mode_prefs.h"	15 #include "chrome/browser/prefs/incognito_mode_prefs.h"

16 #include "chrome/browser/prefs/pref_service.h"	16 #include "chrome/browser/prefs/pref_service.h"

17 #include "chrome/browser/prefs/scoped_user_pref_update.h"	17 #include "chrome/browser/prefs/scoped_user_pref_update.h"

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

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

20 #include "chrome/browser/tabs/tab_strip_model.h"	20 #include "chrome/browser/tabs/tab_strip_model.h"

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

22 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

23 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	23 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

24 #include "chrome/browser/ui/views/aura/launcher/launcher_context_menu.h"	24 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"

25 #include "chrome/browser/ui/views/aura/launcher/launcher_icon_loader.h"	25 #include "chrome/browser/ui/views/ash/launcher/launcher_icon_loader.h"

26 #include "chrome/browser/ui/views/aura/launcher/launcher_updater.h"	26 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"

27 #include "chrome/browser/web_applications/web_app.h"	27 #include "chrome/browser/web_applications/web_app.h"

28 #include "chrome/common/chrome_notification_types.h"	28 #include "chrome/common/chrome_notification_types.h"

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

30 #include "chrome/common/extensions/extension_resource.h"	30 #include "chrome/common/extensions/extension_resource.h"

31 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

32 #include "content/public/browser/notification_service.h"	32 #include "content/public/browser/notification_service.h"

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

34 #include "grit/theme_resources.h"	34 #include "grit/theme_resources.h"

35 #include "ui/aura/window.h"	35 #include "ui/aura/window.h"

36 #include "ui/views/widget/widget.h"	36 #include "ui/views/widget/widget.h"

(...skipping 433 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
470 Profile* ChromeLauncherDelegate::GetProfileForNewWindows() {	470 Profile* ChromeLauncherDelegate::GetProfileForNewWindows() {

471 Profile* profile = ProfileManager::GetDefaultProfile();	471 Profile* profile = ProfileManager::GetDefaultProfile();

472 if (browser_defaults::kAlwaysOpenIncognitoWindow &&	472 if (browser_defaults::kAlwaysOpenIncognitoWindow &&

473 IncognitoModePrefs::ShouldLaunchIncognito(	473 IncognitoModePrefs::ShouldLaunchIncognito(

474 *CommandLine::ForCurrentProcess(),	474 *CommandLine::ForCurrentProcess(),

475 profile->GetPrefs())) {	475 profile->GetPrefs())) {

476 profile = profile->GetOffTheRecordProfile();	476 profile = profile->GetOffTheRecordProfile();

477 }	477 }

478 return profile;	478 return profile;

479 }	479 }

OLD	NEW