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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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
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/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "chrome/browser/ui/host_desktop.h" 80 #include "chrome/browser/ui/host_desktop.h"
81 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 81 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
82 #include "chrome/browser/ui/singleton_tabs.h" 82 #include "chrome/browser/ui/singleton_tabs.h"
83 #include "chrome/browser/ui/tabs/tab_strip_model.h" 83 #include "chrome/browser/ui/tabs/tab_strip_model.h"
84 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" 84 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
85 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 85 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
86 #include "chrome/browser/upgrade_detector.h" 86 #include "chrome/browser/upgrade_detector.h"
87 #include "chrome/common/chrome_switches.h" 87 #include "chrome/common/chrome_switches.h"
88 #include "chrome/common/pref_names.h" 88 #include "chrome/common/pref_names.h"
89 #include "chrome/common/url_constants.h" 89 #include "chrome/common/url_constants.h"
90 #include "chrome/grit/generated_resources.h"
90 #include "chromeos/dbus/dbus_thread_manager.h" 91 #include "chromeos/dbus/dbus_thread_manager.h"
91 #include "chromeos/dbus/session_manager_client.h" 92 #include "chromeos/dbus/session_manager_client.h"
92 #include "chromeos/ime/extension_ime_util.h" 93 #include "chromeos/ime/extension_ime_util.h"
93 #include "chromeos/ime/ime_keyboard.h" 94 #include "chromeos/ime/ime_keyboard.h"
94 #include "chromeos/ime/input_method_manager.h" 95 #include "chromeos/ime/input_method_manager.h"
95 #include "chromeos/login/login_state.h" 96 #include "chromeos/login/login_state.h"
96 #include "chromeos/network/portal_detector/network_portal_detector.h" 97 #include "chromeos/network/portal_detector/network_portal_detector.h"
97 #include "components/google/core/browser/google_util.h" 98 #include "components/google/core/browser/google_util.h"
98 #include "components/policy/core/common/cloud/cloud_policy_store.h" 99 #include "components/policy/core/common/cloud/cloud_policy_store.h"
99 #include "components/user_manager/user.h" 100 #include "components/user_manager/user.h"
100 #include "components/user_manager/user_manager.h" 101 #include "components/user_manager/user_manager.h"
101 #include "components/user_manager/user_type.h" 102 #include "components/user_manager/user_type.h"
102 #include "content/public/browser/notification_observer.h" 103 #include "content/public/browser/notification_observer.h"
103 #include "content/public/browser/notification_service.h" 104 #include "content/public/browser/notification_service.h"
104 #include "content/public/browser/user_metrics.h" 105 #include "content/public/browser/user_metrics.h"
105 #include "content/public/browser/web_contents.h" 106 #include "content/public/browser/web_contents.h"
106 #include "device/bluetooth/bluetooth_adapter.h" 107 #include "device/bluetooth/bluetooth_adapter.h"
107 #include "device/bluetooth/bluetooth_adapter_factory.h" 108 #include "device/bluetooth/bluetooth_adapter_factory.h"
108 #include "device/bluetooth/bluetooth_device.h" 109 #include "device/bluetooth/bluetooth_device.h"
109 #include "grit/ash_strings.h" 110 #include "grit/ash_strings.h"
110 #include "grit/generated_resources.h"
111 #include "grit/locale_settings.h" 111 #include "grit/locale_settings.h"
112 #include "net/base/escape.h" 112 #include "net/base/escape.h"
113 #include "third_party/cros_system_api/dbus/service_constants.h" 113 #include "third_party/cros_system_api/dbus/service_constants.h"
114 #include "ui/base/l10n/l10n_util.h" 114 #include "ui/base/l10n/l10n_util.h"
115 #include "ui/base/l10n/time_format.h" 115 #include "ui/base/l10n/time_format.h"
116 116
117 namespace chromeos { 117 namespace chromeos {
118 118
119 namespace { 119 namespace {
120 120
(...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 accessibility_subscription_.reset(); 1292 accessibility_subscription_.reset();
1293 else 1293 else
1294 OnAccessibilityModeChanged(details.notify); 1294 OnAccessibilityModeChanged(details.notify);
1295 } 1295 }
1296 1296
1297 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1297 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1298 return new SystemTrayDelegateChromeOS(); 1298 return new SystemTrayDelegateChromeOS();
1299 } 1299 }
1300 1300
1301 } // namespace chromeos 1301 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698