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

Side by Side Diff: chrome/browser/bookmarks/bookmark_utils.cc

Issue 7809013: Remove Animation When "Resuming" Window in Lion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adds context parameter to BrowserWindow::Show(...) Created 9 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 (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/bookmarks/bookmark_utils.h" 5 #include "chrome/browser/bookmarks/bookmark_utils.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // opening a url and there is no Browser open. The Browser is created the first 59 // opening a url and there is no Browser open. The Browser is created the first
60 // time the PageNavigator method is invoked. 60 // time the PageNavigator method is invoked.
61 class NewBrowserPageNavigator : public PageNavigator { 61 class NewBrowserPageNavigator : public PageNavigator {
62 public: 62 public:
63 explicit NewBrowserPageNavigator(Profile* profile) 63 explicit NewBrowserPageNavigator(Profile* profile)
64 : profile_(profile), 64 : profile_(profile),
65 browser_(NULL) {} 65 browser_(NULL) {}
66 66
67 virtual ~NewBrowserPageNavigator() { 67 virtual ~NewBrowserPageNavigator() {
68 if (browser_) 68 if (browser_)
69 browser_->window()->Show(); 69 browser_->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
70 } 70 }
71 71
72 Browser* browser() const { return browser_; } 72 Browser* browser() const { return browser_; }
73 73
74 // Deprecated. Please use one-argument variant. 74 // Deprecated. Please use one-argument variant.
75 // TODO(adriansc): Remove this method once refactoring changed all call sites. 75 // TODO(adriansc): Remove this method once refactoring changed all call sites.
76 virtual TabContents* OpenURL(const GURL& url, 76 virtual TabContents* OpenURL(const GURL& url,
77 const GURL& referrer, 77 const GURL& referrer,
78 WindowOpenDisposition disposition, 78 WindowOpenDisposition disposition,
79 PageTransition::Type transition) OVERRIDE { 79 PageTransition::Type transition) OVERRIDE {
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 ++iter) { 746 ++iter) {
747 const BookmarkNode* node = model->GetNodeByID(*iter); 747 const BookmarkNode* node = model->GetNodeByID(*iter);
748 if (!node) 748 if (!node)
749 continue; 749 continue;
750 const BookmarkNode* parent = node->parent(); 750 const BookmarkNode* parent = node->parent();
751 model->Remove(parent, parent->GetIndexOf(node)); 751 model->Remove(parent, parent->GetIndexOf(node));
752 } 752 }
753 } 753 }
754 754
755 } // namespace bookmark_utils 755 } // namespace bookmark_utils
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698