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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (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
« no previous file with comments | « chrome/browser/ui/android/navigation_popup.cc ('k') | chrome/browser/ui/chrome_style.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/ui/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "extensions/browser/extension_registry.h" 73 #include "extensions/browser/extension_registry.h"
74 #include "extensions/browser/extension_system.h" 74 #include "extensions/browser/extension_system.h"
75 #include "extensions/browser/extension_util.h" 75 #include "extensions/browser/extension_util.h"
76 #include "extensions/common/extension.h" 76 #include "extensions/common/extension.h"
77 #include "extensions/common/extension_resource.h" 77 #include "extensions/common/extension_resource.h"
78 #include "extensions/common/manifest_handlers/icons_handler.h" 78 #include "extensions/common/manifest_handlers/icons_handler.h"
79 #include "extensions/common/url_pattern.h" 79 #include "extensions/common/url_pattern.h"
80 #include "grit/ash_resources.h" 80 #include "grit/ash_resources.h"
81 #include "grit/generated_resources.h" 81 #include "grit/generated_resources.h"
82 #include "grit/theme_resources.h" 82 #include "grit/theme_resources.h"
83 #include "grit/ui_resources.h"
84 #include "net/base/url_util.h" 83 #include "net/base/url_util.h"
85 #include "ui/aura/window.h" 84 #include "ui/aura/window.h"
86 #include "ui/aura/window_event_dispatcher.h" 85 #include "ui/aura/window_event_dispatcher.h"
87 #include "ui/base/l10n/l10n_util.h" 86 #include "ui/base/l10n/l10n_util.h"
88 #include "ui/keyboard/keyboard_util.h" 87 #include "ui/keyboard/keyboard_util.h"
88 #include "ui/resources/grit/ui_resources.h"
89 #include "ui/wm/core/window_animations.h" 89 #include "ui/wm/core/window_animations.h"
90 90
91 #if defined(OS_CHROMEOS) 91 #if defined(OS_CHROMEOS)
92 #include "chrome/browser/browser_process.h" 92 #include "chrome/browser/browser_process.h"
93 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 93 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
94 #include "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_contr oller.h" 94 #include "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_contr oller.h"
95 #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h" 95 #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h"
96 #include "components/user_manager/user_manager.h" 96 #include "components/user_manager/user_manager.h"
97 #endif 97 #endif
98 98
(...skipping 1995 matching lines...) Expand 10 before | Expand all | Expand 10 after
2094 } 2094 }
2095 2095
2096 void ChromeLauncherController::ReleaseProfile() { 2096 void ChromeLauncherController::ReleaseProfile() {
2097 if (app_sync_ui_state_) 2097 if (app_sync_ui_state_)
2098 app_sync_ui_state_->RemoveObserver(this); 2098 app_sync_ui_state_->RemoveObserver(this);
2099 2099
2100 PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this); 2100 PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
2101 2101
2102 pref_change_registrar_.RemoveAll(); 2102 pref_change_registrar_.RemoveAll();
2103 } 2103 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/navigation_popup.cc ('k') | chrome/browser/ui/chrome_style.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698