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

Side by Side Diff: chrome/browser/ui/views/aura/chrome_shell_delegate.cc

Issue 8914023: Relands fixes for 106432, 107287 and 107401. These got reverted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Da fix Created 9 years 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
6 6
7 #include "chrome/browser/profiles/profile_manager.h" 7 #include "chrome/browser/profiles/profile_manager.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/views/aura/app_list_window.h" 9 #include "chrome/browser/ui/views/aura/app_list_window.h"
10 #include "chrome/browser/ui/views/aura/status_area_host_aura.h" 10 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"
11 #include "chrome/browser/ui/views/frame/browser_view.h" 11 #include "chrome/browser/ui/views/frame/browser_view.h"
12 #include "grit/theme_resources.h"
12 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
13 #include "ui/aura_shell/launcher/launcher_types.h" 14 #include "ui/aura_shell/launcher/launcher_types.h"
14 #include "ui/aura_shell/window_util.h" 15 #include "ui/aura_shell/window_util.h"
15 16
16 // static 17 // static
17 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; 18 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
18 19
19 ChromeShellDelegate::ChromeShellDelegate() { 20 ChromeShellDelegate::ChromeShellDelegate() {
20 instance_ = this; 21 instance_ = this;
21 } 22 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 const aura_shell::LauncherItem& item) { 70 const aura_shell::LauncherItem& item) {
70 aura_shell::ActivateWindow(item.window); 71 aura_shell::ActivateWindow(item.window);
71 } 72 }
72 73
73 bool ChromeShellDelegate::ConfigureLauncherItem( 74 bool ChromeShellDelegate::ConfigureLauncherItem(
74 aura_shell::LauncherItem* item) { 75 aura_shell::LauncherItem* item) {
75 BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window); 76 BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window);
76 return view && 77 return view &&
77 ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type)); 78 ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type));
78 } 79 }
80
81 int ChromeShellDelegate::GetResourceIDForNewBrowserWindow() {
82 return IDR_PRODUCT_LOGO_32;
83 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/aura/chrome_shell_delegate.h ('k') | ui/aura_shell/examples/aura_shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698