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/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
6 | 6 |
7 #include "ash/content_support/gpu_support_impl.h" | 7 #include "ash/content_support/gpu_support_impl.h" |
8 #include "ash/wm/window_state.h" | 8 #include "ash/wm/window_state.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "chrome/browser/app_mode/app_mode_utils.h" | 10 #include "chrome/browser/app_mode/app_mode_utils.h" |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 return new ash::GPUSupportImpl; | 165 return new ash::GPUSupportImpl; |
166 } | 166 } |
167 | 167 |
168 base::string16 ChromeShellDelegate::GetProductName() const { | 168 base::string16 ChromeShellDelegate::GetProductName() const { |
169 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 169 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
170 } | 170 } |
171 | 171 |
172 void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const { | 172 void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const { |
173 Profile* profile = ProfileManager::GetActiveUserProfile(); | 173 Profile* profile = ProfileManager::GetActiveUserProfile(); |
174 Browser* browser = | 174 Browser* browser = |
175 chrome::FindTabbedBrowser(profile, false, chrome::HOST_DESKTOP_TYPE_ASH); | 175 chrome::FindTabbedBrowser(profile, false, ui::HOST_DESKTOP_TYPE_ASH); |
176 | 176 |
177 if (!browser) { | 177 if (!browser) { |
178 browser = new Browser( | 178 browser = |
179 Browser::CreateParams(profile, chrome::HOST_DESKTOP_TYPE_ASH)); | 179 new Browser(Browser::CreateParams(profile, ui::HOST_DESKTOP_TYPE_ASH)); |
180 browser->window()->Activate(); | 180 browser->window()->Activate(); |
181 browser->window()->Show(); | 181 browser->window()->Show(); |
182 } | 182 } |
183 | 183 |
184 chrome::NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl), | 184 chrome::NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl), |
185 ui::PAGE_TRANSITION_AUTO_BOOKMARK); | 185 ui::PAGE_TRANSITION_AUTO_BOOKMARK); |
186 params.disposition = SINGLETON_TAB; | 186 params.disposition = SINGLETON_TAB; |
187 chrome::Navigate(¶ms); | 187 chrome::Navigate(¶ms); |
188 } | 188 } |
189 | 189 |
(...skipping 16 matching lines...) Expand all Loading... |
206 | 206 |
207 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( | 207 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( |
208 ash::VirtualKeyboardStateObserver* observer) { | 208 ash::VirtualKeyboardStateObserver* observer) { |
209 keyboard_state_observer_list_.AddObserver(observer); | 209 keyboard_state_observer_list_.AddObserver(observer); |
210 } | 210 } |
211 | 211 |
212 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( | 212 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( |
213 ash::VirtualKeyboardStateObserver* observer) { | 213 ash::VirtualKeyboardStateObserver* observer) { |
214 keyboard_state_observer_list_.RemoveObserver(observer); | 214 keyboard_state_observer_list_.RemoveObserver(observer); |
215 } | 215 } |
OLD | NEW |